From: Ewan Mellor Date: Fri, 15 Sep 2006 22:54:04 +0000 (+0100) Subject: Revert change to vtpm_utils related to skipping the test when the tpm is not X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15658^2~52^2~3 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=3714ab433f4dd19572b7ce3ff431b6be3420f2d7;p=xen.git Revert change to vtpm_utils related to skipping the test when the tpm is not found -- we need to skip the test on non-TPM platforms, of course. Signed-off-by: Ewan Mellor --- diff --git a/tools/xm-test/tests/vtpm/vtpm_utils.py b/tools/xm-test/tests/vtpm/vtpm_utils.py index 70af1d30f8..01a60f90c6 100644 --- a/tools/xm-test/tests/vtpm/vtpm_utils.py +++ b/tools/xm-test/tests/vtpm/vtpm_utils.py @@ -8,6 +8,9 @@ from XmTestLib import * if ENABLE_HVM_SUPPORT: SKIP("vtpm tests not supported for HVM domains") +if not os.path.exists("/dev/tpm0"): + SKIP("This machine has no hardware TPM; cannot run this test") + status, output = traceCommand("ps aux | grep vtpm_manager | grep -v grep") if output == "": FAIL("virtual TPM manager must be started to run this test")